Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Tue, 23 Apr 2013 16:58:23 +0000 (19:58 +0300)
committerEli Zaretskii <eliz@gnu.org>
Tue, 23 Apr 2013 16:58:23 +0000 (19:58 +0300)
commit32ad847f1c79fe813e80920b10915175be688248
tree8ae2940e57d6f1e8aafa2e152f70bb3c359be048
parentf1636eb686eb0ba7a21a6669edff2d0a980f6170
parent8195e784cb63b47bf174a889d7e1a26999c3e1e3
Merge from trunk.